Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 28 May 2010 11:27:13 +0000 (11:27 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 28 May 2010 11:27:13 +0000 (11:27 +0000)
commit1469628e37712d9f1b96ca79a93fd94d8d0eee56
treec0d844e4ab67791b00f13295ed6d7c5b1324f9dc
parent83768caa87acab160b218bc4d9cb55ea447652e9
parent0c02d78a3dd6630516bc0755a45724946e0eba04
Merge from mainline.